54d284abd2f2c6f983390b06ea8fb60053f9491a,subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/IdeaModelBuilder.java,IdeaModelBuilder,buildDependencies,#Map#IdeaModule#,121
Before Change
DefaultIdeaSingleEntryLibraryDependency defaultDependency = new org.gradle.tooling.internal.idea.DefaultIdeaSingleEntryLibraryDependency()
.setFile(d.getLibraryFile())
.setSource(d.getSourceFile())
.setJavadoc(d.getJavadocFile())
.setScope(new DefaultIdeaDependencyScope(d.getScope()))
.setExported(d.isExported());
if (d.getModuleVersion() != null) {
defaultDependency.setGradleModuleVersion(new DefaultGradleModuleVersion(d.getModuleVersion()));
}
dependencies.add(defaultDependency);
} else if (dependency instanceof ModuleDependency) {
ModuleDependency d = (ModuleDependency) dependency;
DefaultIdeaModule targetModule = modules.get(d.getName());
File targetProjectDirectory = targetModule == null
? compositeProjectMapper.getProjectDirectory(d.getGradlePath())
: targetModule.getGradleProject().getProjectDirectory();
DefaultIdeaModuleDependency defaultDependency = new org.gradle.tooling.internal.idea.DefaultIdeaModuleDependency()
.setExported(d.isExported())
.setScope(new DefaultIdeaDependencyScope(d.getScope()))
.setDependencyModule(targetModule)
.setProjectDirectory(targetProjectDirectory);
dependencies.add(defaultDependency);
}
}
After Change
DefaultIdeaSingleEntryLibraryDependency defaultDependency = new DefaultIdeaSingleEntryLibraryDependency()
.setFile(d.getLibraryFile())
.setSource(d.getSourceFile())
.setJavadoc(d.getJavadocFile())
.setScope(new DefaultIdeaDependencyScope(d.getScope()))
.setExported(d.isExported());
if (d.getModuleVersion() != null) {
defaultDependency.setGradleModuleVersion(new DefaultGradleModuleVersion(d.getModuleVersion()));
}
dependencies.add(defaultDependency);
} else if (dependency instanceof ModuleDependency) {
ModuleDependency d = (ModuleDependency) dependency;
DefaultIdeaModule targetModule = modules.get(d.getName());
File targetProjectDirectory = targetModule == null
? compositeProjectMapper.getProjectDirectory(d.getGradlePath())
: targetModule.getGradleProject().getProjectDirectory();
DefaultIdeaModuleDependency defaultDependency = new DefaultIdeaModuleDependency()
.setExported(d.isExported())
.setScope(new DefaultIdeaDependencyScope(d.getScope()))
.setDependencyModule(targetModule)
.setProjectDirectory(targetProjectDirectory);
dependencies.add(defaultDependency);
}
}